From 5faf6b2ae30f2ca26d8e7c4b4755d369f8ffc69c Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 15 Feb 2006 12:21:12 +0100 Subject: [PATCH] Fix x86/64 build for gcc-4.1-pre. Signed-off-by: Keir Fraser --- xen/arch/x86/shadow.c | 6 +++--- xen/include/asm-x86/mpspec_def.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c index c748bbde0f..f9bffa40c7 100644 --- a/xen/arch/x86/shadow.c +++ b/xen/arch/x86/shadow.c @@ -821,7 +821,7 @@ static void shadow_set_l1e_64( { struct vcpu *v = current; struct domain *d = v->domain; - pgentry_64_t sle; + pgentry_64_t sle = { 0 }; pgentry_64_t sle_up = {0}; l1_pgentry_t old_spte; l1_pgentry_t sl1e = *(l1_pgentry_t *)sl1e_p; @@ -1606,7 +1606,7 @@ static int resync_all(struct domain *d, u32 stype) perfc_incr_histo(l1_entries_checked, max_shadow - min_shadow + 1, PT_UPDATES); if ( d->arch.ops->guest_paging_levels >= PAGING_L3 && unshadow_l1 ) { - pgentry_64_t l2e; + pgentry_64_t l2e = { 0 }; __shadow_get_l2e(entry->v, entry->va, &l2e); @@ -3407,7 +3407,7 @@ static inline int guest_page_fault( guest_l2_pgentry_t *gpl2e, guest_l1_pgentry_t *gpl1e) { struct domain *d = v->domain; - pgentry_64_t gle; + pgentry_64_t gle = { 0 }; unsigned long gpfn = 0, mfn; int i; diff --git a/xen/include/asm-x86/mpspec_def.h b/xen/include/asm-x86/mpspec_def.h index 902c030f7f..d348eb73ad 100644 --- a/xen/include/asm-x86/mpspec_def.h +++ b/xen/include/asm-x86/mpspec_def.h @@ -75,7 +75,7 @@ struct mpc_config_bus { unsigned char mpc_type; unsigned char mpc_busid; - unsigned char mpc_bustype[6] __attribute((packed)); + unsigned char mpc_bustype[6]; }; /* List of Bus Type string values, Intel MP Spec. */ -- 2.30.2